Improved Error Handling

No longer fails on null return arrays