Fixed command conventions and exception