Initialize 'win' to NULL and only return a window id if we have a valid 'win'
Initialize 'win' to NULL and only return a window id if we have a
valid 'win'

Signed-off-by: Chris Michael <48d1b61d21f8504b6dc08474b224ab6407ac8581@comcast.net>

rvandegrift/elementary,FlorentRevest/Elementary,rvandegrift/elementary,rvandegrift/elementary,tasn/elementary,tasn/elementary,FlorentRevest/Elementary,tasn/elementary,tasn/elementary,rvandegrift/elementary,tasn/elementary,FlorentRevest/Elementary,FlorentRevest/Elementary