Added additional checks/messages/weird-behavior-handling