Cleaned up some error messaging