more verbose safety checks added