Fixed nasty bug that lead to null pointer exception with WatchSight