Fixing signs

Few changes, null checks etc to keep signs working properly