Error handling
Fix height bug