Added null checks
Fixed
Fixed move block method