Added suggests
Added some more fail-safe checks